…e into chore/BYT-6671

…e into chore/BYT-6671

# Conflicts:
#	VERSION
#	client/policy.go
#	examples/settings/main.tf
#	examples/setup/main.tf
#	provider/data_source_setting.go
#	provider/resource_setting.go

…e into fix/vcs

# Conflicts:
#	client/policy.go
#	examples/policies/main.tf
#	examples/settings/main.tf
#	examples/setup/main.tf
#	provider/data_source_policy.go
#	provider/data_source_setting.go
#	provider/resource_policy.go